From bda2d64b0bb549b78e5fe8f0b2b1844f26135828 Mon Sep 17 00:00:00 2001
From: "cl349@firebug.cl.cam.ac.uk" <cl349@firebug.cl.cam.ac.uk>
Date: Thu, 28 Apr 2005 15:11:15 +0000
Subject: [PATCH] bitkeeper revision 1.1385.2.1
 (4270fd13Fv84etl6vfPTPXdxld-15A)

page.h:
  Revert change to pgd_val to always set the PAGE_PRESENT bit.
fixup.c:
  Cleanup whitespace.
setup.c:
  Whitespace cleanup.
  Whitespace cleanups.
process.c:
  Whitespace.
pci-dma.c:
  revert part of previous for sync w/ 2.0.
  g/c unused code and cleanup whitespace.
head.S:
  Break __xen_guest definition up in several lines.
common.c:
  whitespace cleanup.
---
 .../arch/xen/i386/kernel/cpu/common.c         |  2 +-
 .../arch/xen/i386/kernel/head.S               |  4 +-
 .../arch/xen/i386/kernel/pci-dma.c            | 42 +++++++------------
 .../arch/xen/i386/kernel/process.c            |  4 +-
 .../arch/xen/i386/kernel/setup.c              | 32 +++++++-------
 .../arch/xen/kernel/fixup.c                   |  7 ++--
 .../include/asm-xen/asm-i386/page.h           |  2 +-
 7 files changed, 40 insertions(+), 53 deletions(-)

diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/cpu/common.c b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/cpu/common.c
index 3dc5ed10a6..c608ef099a 100644
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/cpu/common.c
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/cpu/common.c
@@ -600,7 +600,7 @@ void __init cpu_init (void)
 	 * Set up the per-thread TLS descriptor cache:
 	 */
 	memcpy(thread->tls_array, &get_cpu_gdt_table(cpu)[GDT_ENTRY_TLS_MIN],
-		GDT_ENTRY_TLS_ENTRIES * 8);
+	       GDT_ENTRY_TLS_ENTRIES * 8);
 
 	cpu_gdt_init(&cpu_gdt_descr[cpu]);
 
diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/head.S b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/head.S
index 04afb41017..91036572bc 100644
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/head.S
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/head.S
@@ -2,7 +2,9 @@
 #include <linux/config.h>
 
 .section __xen_guest
-	.ascii	"GUEST_OS=linux,GUEST_VER=2.6,XEN_VER=3.0,VIRT_BASE=0xC0000000"
+	.ascii	"GUEST_OS=linux,GUEST_VER=2.6"
+	.ascii	",XEN_VER=3.0"
+	.ascii	",VIRT_BASE=0xC0000000"
 	.ascii	",LOADER=generic"
 	.byte	0
 
diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/pci-dma.c b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/pci-dma.c
index b4696e4e4c..0716f0c62b 100644
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/pci-dma.c
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/pci-dma.c
@@ -44,13 +44,13 @@ xen_contig_memory(unsigned long vstart, unsigned int order)
 
 	/* 1. Zap current PTEs, giving away the underlying pages. */
 	for (i = 0; i < (1<<order); i++) {
-		pgd = pgd_offset_k(   (vstart + (i*PAGE_SIZE)));
-		pud = pud_offset(pgd, (vstart + (i*PAGE_SIZE)));
-		pmd = pmd_offset(pud, (vstart + (i*PAGE_SIZE)));
-		pte = pte_offset_kernel(pmd, (vstart + (i*PAGE_SIZE)));
-		pfn = pte->pte_low >> PAGE_SHIFT;
-		HYPERVISOR_update_va_mapping(
-			vstart + (i*PAGE_SIZE), __pte_ma(0), 0);
+		pgd = pgd_offset_k(vstart + (i*PAGE_SIZE));
+		pud = pud_offset(pgd, vstart + (i*PAGE_SIZE));
+		pmd = pmd_offset(pud, vstart + (i*PAGE_SIZE));
+		pte = pte_offset_kernel(pmd, vstart + (i*PAGE_SIZE));
+		pfn = pte_val_ma(*pte) >> PAGE_SHIFT;
+		HYPERVISOR_update_va_mapping(vstart + (i*PAGE_SIZE),
+					     __pte_ma(0), 0);
 		phys_to_machine_mapping[(__pa(vstart)>>PAGE_SHIFT)+i] =
 			INVALID_P2M_ENTRY;
 		if (HYPERVISOR_dom_mem_op(MEMOP_decrease_reservation, 
@@ -61,17 +61,10 @@ xen_contig_memory(unsigned long vstart, unsigned int order)
 				  &pfn, 1, order) != 1) BUG();
 	/* 3. Map the new extent in place of old pages. */
 	for (i = 0; i < (1<<order); i++) {
-		pgd = pgd_offset_k(   (vstart + (i*PAGE_SIZE)));
-		pud = pud_offset(pgd, (vstart + (i*PAGE_SIZE)));
-		pmd = pmd_offset(pud, (vstart + (i*PAGE_SIZE)));
-		pte = pte_offset_kernel(pmd, (vstart + (i*PAGE_SIZE)));
-		HYPERVISOR_update_va_mapping(
-			vstart + (i*PAGE_SIZE),
+		HYPERVISOR_update_va_mapping(vstart + (i*PAGE_SIZE),
 			__pte_ma(((pfn+i)<<PAGE_SHIFT)|__PAGE_KERNEL), 0);
-		xen_machphys_update(
-			pfn+i, (__pa(vstart)>>PAGE_SHIFT)+i);
-		phys_to_machine_mapping[(__pa(vstart)>>PAGE_SHIFT)+i] =
-			pfn+i;
+		xen_machphys_update(pfn+i, (__pa(vstart)>>PAGE_SHIFT)+i);
+		phys_to_machine_mapping[(__pa(vstart)>>PAGE_SHIFT)+i] = pfn+i;
 	}
 	flush_tlb_all();
 
@@ -82,11 +75,9 @@ void *dma_alloc_coherent(struct device *dev, size_t size,
 			   dma_addr_t *dma_handle, int gfp)
 {
 	void *ret;
+	struct dma_coherent_mem *mem = dev ? dev->dma_mem : NULL;
 	unsigned int order = get_order(size);
 	unsigned long vstart;
-
-	struct dma_coherent_mem *mem = dev ? dev->dma_mem : NULL;
-
 	/* ignore region specifiers */
 	gfp &= ~(__GFP_DMA | __GFP_HIGHMEM);
 
@@ -108,14 +99,13 @@ void *dma_alloc_coherent(struct device *dev, size_t size,
 
 	vstart = __get_free_pages(gfp, order);
 	ret = (void *)vstart;
-	if (ret == NULL)
-		return ret;
-
-	xen_contig_memory(vstart, order);
 
-	memset(ret, 0, size);
-	*dma_handle = virt_to_bus(ret);
+	if (ret != NULL) {
+		xen_contig_memory(vstart, order);
 
+		memset(ret, 0, size);
+		*dma_handle = virt_to_bus(ret);
+	}
 	return ret;
 }
 
diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/process.c b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/process.c
index 771208d00c..0f9a2eed70 100644
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/process.c
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/process.c
@@ -329,7 +329,7 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long esp,
 		desc->b = LDT_entry_b(&info);
 	}
 
-        p->thread.io_pl = current->thread.io_pl;
+	p->thread.io_pl = current->thread.io_pl;
 
 	err = 0;
  out:
@@ -445,7 +445,7 @@ struct task_struct fastcall * __switch_to(struct task_struct *prev_p, struct tas
 	physdev_op_t iopl_op, iobmp_op;
 	multicall_entry_t _mcl[8], *mcl = _mcl;
 
-        /* XEN NOTE: FS/GS saved in switch_mm(), not here. */
+	/* XEN NOTE: FS/GS saved in switch_mm(), not here. */
 
 	/*
 	 * This is basically '__unlazy_fpu', except that we queue a
diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c
index 5723ed21c4..2d385c1c09 100644
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c
@@ -40,6 +40,7 @@
 #include <linux/efi.h>
 #include <linux/init.h>
 #include <linux/edd.h>
+#include <linux/kernel.h>
 #include <linux/percpu.h>
 #include <linux/notifier.h>
 #include <video/edid.h>
@@ -59,15 +60,11 @@
 /* Allows setting of maximum possible memory size  */
 static unsigned long xen_override_max_pfn;
 
-extern struct notifier_block *panic_notifier_list;
 static int xen_panic_event(struct notifier_block *, unsigned long, void *);
 static struct notifier_block xen_panic_block = {
-	xen_panic_event,
-        NULL,
-        0 /* try to go last */
+	xen_panic_event, NULL, 0 /* try to go last */
 };
 
-
 int disable_pse __initdata = 0;
 
 /*
@@ -901,6 +898,7 @@ efi_find_max_pfn(unsigned long start, unsigned long end, void *arg)
 	return 0;
 }
 
+
 /*
  * Find the highest page frame number we have available
  */
@@ -1397,22 +1395,21 @@ static void set_mca_bus(int x) { }
  */
 void __init setup_arch(char **cmdline_p)
 {
-	int i,j;
+	int i, j;
 	physdev_op_t op;
 	unsigned long max_low_pfn;
 
 	/* Force a quick death if the kernel panics. */
 	extern int panic_timeout;
-	if ( panic_timeout == 0 )
+	if (panic_timeout == 0)
 		panic_timeout = 1;
 
 	/* Register a call for panic conditions. */
 	notifier_chain_register(&panic_notifier_list, &xen_panic_block);
 
-	HYPERVISOR_vm_assist(
-		VMASST_CMD_enable, VMASST_TYPE_4gb_segments);
-	HYPERVISOR_vm_assist(
-		VMASST_CMD_enable, VMASST_TYPE_writable_pagetables);
+	HYPERVISOR_vm_assist(VMASST_CMD_enable, VMASST_TYPE_4gb_segments);
+	HYPERVISOR_vm_assist(VMASST_CMD_enable,
+			     VMASST_TYPE_writable_pagetables);
 
 	memcpy(&boot_cpu_data, &new_cpu_data, sizeof(new_cpu_data));
 	early_cpu_init();
@@ -1478,7 +1475,8 @@ void __init setup_arch(char **cmdline_p)
 	init_mm.start_code = (unsigned long) _text;
 	init_mm.end_code = (unsigned long) _etext;
 	init_mm.end_data = (unsigned long) _edata;
-	init_mm.brk = (PFN_UP(__pa(xen_start_info.pt_base)) + xen_start_info.nr_pt_frames) << PAGE_SHIFT;
+	init_mm.brk = (PFN_UP(__pa(xen_start_info.pt_base)) +
+		       xen_start_info.nr_pt_frames) << PAGE_SHIFT;
 
 	/* XEN: This is nonsense: kernel may not even be contiguous in RAM. */
 	/*code_resource.start = virt_to_phys(_text);*/
@@ -1511,7 +1509,7 @@ void __init setup_arch(char **cmdline_p)
 			max_pfn * sizeof(unsigned long));
 
 		if (max_pfn > xen_start_info.nr_pages) {
-			/* set to INVALID_P2M_ENTRY */                        
+			/* set to INVALID_P2M_ENTRY */
 			memset(phys_to_machine_mapping, ~0,
 				max_pfn * sizeof(unsigned long));
 			memcpy(phys_to_machine_mapping,
@@ -1617,16 +1615,14 @@ void __init setup_arch(char **cmdline_p)
 	}
 }
 
-
 static int
 xen_panic_event(struct notifier_block *this, unsigned long event, void *ptr)
 {
-     HYPERVISOR_crash();    
-     /* we're never actually going to get here... */
-     return NOTIFY_DONE;
+	HYPERVISOR_crash();    
+	/* we're never actually going to get here... */
+	return NOTIFY_DONE;
 }
 
-
 #include "setup_arch_post.h"
 /*
  * Local Variables:
diff --git a/linux-2.6.11-xen-sparse/arch/xen/kernel/fixup.c b/linux-2.6.11-xen-sparse/arch/xen/kernel/fixup.c
index 271dbb7f1f..1c01b91787 100644
--- a/linux-2.6.11-xen-sparse/arch/xen/kernel/fixup.c
+++ b/linux-2.6.11-xen-sparse/arch/xen/kernel/fixup.c
@@ -50,8 +50,8 @@ __LINKAGE void do_fixup_4gb_segment(struct pt_regs *regs, long error_code)
 
     if ( !test_and_set_bit(0, &printed) )
     {
-        HYPERVISOR_vm_assist(
-            VMASST_CMD_disable, VMASST_TYPE_4gb_segments_notify);
+        HYPERVISOR_vm_assist(VMASST_CMD_disable,
+			     VMASST_TYPE_4gb_segments_notify);
 
         DP("");
         DP("***************************************************************");
@@ -77,8 +77,7 @@ __LINKAGE void do_fixup_4gb_segment(struct pt_regs *regs, long error_code)
 
 static int __init fixup_init(void)
 {
-    HYPERVISOR_vm_assist(
-        VMASST_CMD_enable, VMASST_TYPE_4gb_segments_notify);
+    HYPERVISOR_vm_assist(VMASST_CMD_enable, VMASST_TYPE_4gb_segments_notify);
     return 0;
 }
 __initcall(fixup_init);
diff --git a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/page.h b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/page.h
index 1379b49694..345b8264b8 100644
--- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/page.h
+++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/page.h
@@ -111,7 +111,7 @@ typedef struct { unsigned long pgprot; } pgprot_t;
 static inline unsigned long pgd_val(pgd_t x)
 {
 	unsigned long ret = x.pgd;
-	if (ret) ret = machine_to_phys(ret) | 1;
+	if (ret) ret = machine_to_phys(ret);
 	return ret;
 }
 #define pgprot_val(x)	((x).pgprot)
-- 
2.30.2